7ee6c4c7784c8541ac74f7fe147a634e11f48f69,subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/PlatformToolRegistry.java,PlatformToolRegistry,PlatformToolRegistry,#ToolRegistry#TargetPlatformConfiguration#,29
Before Change
// TODO:DAZ Replace TargetPlatformConfiguration with an action that applies to the entire registry.
// This will involve exposing the tools by their 'name' in a container, and applying the action to that container.
register(defaultTools.getTool(ToolType.CPP_COMPILER), configuration.getCppCompilerArgs());
register(defaultTools.getTool(ToolType.C_COMPILER), configuration.getCCompilerArgs());
register(defaultTools.getTool(ToolType.OBJECTIVECPP_COMPILER), configuration.getObjectiveCppCompilerArgs());
register(defaultTools.getTool(ToolType.OBJECTIVEC_COMPILER), configuration.getObjectiveCCompilerArgs());
register(defaultTools.getTool(ToolType.ASSEMBLER), configuration.getAssemblerArgs());
register(defaultTools.getTool(ToolType.LINKER), configuration.getLinkerArgs());
After Change
public PlatformToolRegistry(ToolRegistry defaultTools, ApplyablePlatformConfiguration applyablePlatformConfiguration) {
// TODO:DAZ Replace TargetPlatformConfiguration with an action that applies to the entire registry.
DefaultConfigurableToolChain configurableToolChain = new DefaultConfigurableToolChain(
defaultTools.getTool(ToolType.C_COMPILER),
defaultTools.getTool(ToolType.CPP_COMPILER),
defaultTools.getTool(ToolType.ASSEMBLER),
defaultTools.getTool(ToolType.OBJECTIVEC_COMPILER),
defaultTools.getTool(ToolType.OBJECTIVECPP_COMPILER),
defaultTools.getTool(ToolType.LINKER),
defaultTools.getTool(ToolType.STATIC_LIB_ARCHIVER));
applyablePlatformConfiguration.apply(configurableToolChain);
register(configurableToolChain.getCCompiler());
register(configurableToolChain.getCppCompiler());
register(configurableToolChain.getAssembler());
register(configurableToolChain.getObjcCompiler());
register(configurableToolChain.getObjcppCompiler());
register(configurableToolChain.getLinker());
register(configurableToolChain.getStaticLibArchiver());